Explicitally define some variables

Function documentation

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 8317664..11b9db7 100644 (file)
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -3128,7 +3128,7 @@ class ResultWrapper implements Iterator {
        /**
         * Create a new result object from a result resource and a Database object
         *
-        * @param Database $database
+        * @param DatabaseBase $database
         * @param resource $result
         */
        function __construct( $database, $result ) {

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 5c2289a..9c923b9 100644 (file)
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -52,7 +52,7 @@ class LanguageConverter {
        /**
         * Constructor
         *
-        * @param $langobj The Language Object
+        * @param $langobj Language The Language Object
         * @param $maincode String: the main language code of this language
         * @param $variants Array: the supported variants of this language
         * @param $variantfallbacks Array: the fallback language of each variant

diff --git a/languages/classes/LanguageKk.php b/languages/classes/LanguageKk.php
index e3caacc..47e1309 100644 (file)
--- a/languages/classes/LanguageKk.php
+++ b/languages/classes/LanguageKk.php
@@ -18,6 +18,8 @@ define( 'H_HAMZA', 'ٴ' ); # U+0674 ARABIC LETTER HIGH HAMZA
  */
 class KkConverter extends LanguageConverter {
 
+       protected $mCyrl2Latn, $mLatn2Cyrl, $mCyLa2Arab;
+
        function __construct( $langobj, $maincode,
                                                                $variants = array(),
                                                                $variantfallbacks = array(),
@@ -200,6 +202,7 @@ class KkConverter extends LanguageConverter {
                        return parent::parseManualRule( $rule, $flags );
                }
 
+               $carray = array();
                // otherwise ignore all formatting
                foreach ( $this->mVariants as $v ) {
                        $carray[$v] = $rule;

diff --git a/languages/classes/LanguageSr.php b/languages/classes/LanguageSr.php
index 35c9010..edcae28 100644 (file)
--- a/languages/classes/LanguageSr.php
+++ b/languages/classes/LanguageSr.php
@@ -68,6 +68,7 @@ class SrConverter extends LanguageConverter {
                        return parent::parseManualRule( $rule, $flags );
                }
 
+               $carray = array();
                // otherwise ignore all formatting
                foreach ( $this->mVariants as $v ) {
                        $carray[$v] = $rule;
@@ -176,10 +177,14 @@ class LanguageSr extends LanguageSr_ec {
        }
 
        function convertPlural( $count, $forms ) {
-               if ( !count( $forms ) ) { return ''; }
+               if ( !count( $forms ) ) {
+                       return '';
+               }
 
                // if no number with word, then use $form[0] for singular and $form[1] for plural or zero
-               if ( count( $forms ) === 2 ) return $count == 1 ? $forms[0] : $forms[1];
+               if ( count( $forms ) === 2 ) {
+                       return $count == 1 ? $forms[0] : $forms[1];
+               }
 
                // FIXME: CLDR defines 4 plural forms. Form with decimals missing.
                // See http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html#ru